diff --git a/src/alice/alice.h b/src/alice/alice.h
index 7e4a9d4721..5300090fc2 100644
--- a/src/alice/alice.h
+++ b/src/alice/alice.h
@@ -38,8 +38,7 @@
 
 #include "../alice/blk.h"
 
-enum val_values
-{
+enum val_errors {
 	VAL_INVALID_DB_VERSION	= 0,
 	VAL_RECORD_ERRORS		= 1,
 	VAL_BLOB_PAGE_ERRORS	= 2,
@@ -101,8 +100,7 @@ typedef struct tdr : public pool_alloc<alice_type_tdr>
 /* Transaction Description Record */
 
 const int TDR_VERSION		= 1;
-enum tdr_vals 
-{
+enum tdr_vals {
 	TDR_HOST_SITE		= 1,
 	TDR_DATABASE_PATH	= 2,
 	TDR_TRANSACTION_ID	= 3,
@@ -202,3 +200,4 @@ extern tgbl *gdgbl;
 #endif
 
 #endif	// ALICE_ALICE_H
+
diff --git a/src/alice/alice_meta.epp b/src/alice/alice_meta.epp
index 2c5a19a909..981a3ddeba 100644
--- a/src/alice/alice_meta.epp
+++ b/src/alice/alice_meta.epp
@@ -27,7 +27,7 @@
  *
  *____________________________________________________________
  *
- *	$Id: alice_meta.epp,v 1.18 2003-09-18 10:56:32 brodsom Exp $
+ *	$Id: alice_meta.epp,v 1.19 2003-09-22 08:49:45 brodsom Exp $
  */
 
 #include "firebird.h"
@@ -77,7 +77,8 @@ static rfr_tab_t rfr_table[] = {
 	{ 0, 0, 0 }
 };
 
-static inline void return_error(ISC_STATUS *user_status){
+static inline void return_error(ISC_STATUS *user_status)
+{
 	ALICE_print_status(gds_status);
 	Firebird::status_exception::raise(0);
 }
diff --git a/src/alice/exe.cpp b/src/alice/exe.cpp
index 559423d407..c4c68ad5fb 100644
--- a/src/alice/exe.cpp
+++ b/src/alice/exe.cpp
@@ -24,7 +24,7 @@
 //
 //____________________________________________________________
 //
-//	$Id: exe.cpp,v 1.17 2003-09-18 10:56:32 brodsom Exp $
+//	$Id: exe.cpp,v 1.18 2003-09-22 08:49:45 brodsom Exp $
 //
 // 2001.07.06 Sean Leyne - Code Cleanup, removed "#ifdef READONLY_DATABASE"
 //                         conditionals, as the engine now fully supports
@@ -64,15 +64,16 @@ static TEXT val_errors[] =
 static inline void stuff_dpb(UCHAR **d, int blr)
 {
 	UCHAR *ptr = *d;
-	*ptr++ = (UCHAR)(blr);
+	*ptr++ = (UCHAR)blr;
 	*d = ptr;
 }
-static inline void stuff_dpb_int(UCHAR **d, int blr)
+
+static inline void stuff_dpb_long(UCHAR **d, int blr)
 {
 	stuff_dpb(d, blr);
-	stuff_dpb(d, (blr) >> 8);
-	stuff_dpb(d, (blr) >> 16);
-	stuff_dpb(d, (blr) >> 24);
+	stuff_dpb(d, blr >> 8);
+	stuff_dpb(d, blr >> 16);
+	stuff_dpb(d, blr >> 24);
 }
 
 
@@ -321,7 +322,7 @@ static USHORT build_dpb(UCHAR * dpb, ULONG switches)
 	else if (switches & sw_set_db_dialect) {
 		stuff_dpb(&dpb2, isc_dpb_set_db_sql_dialect);
 		stuff_dpb(&dpb2, 4);
-		stuff_dpb_int(&dpb2, tdgbl->ALICE_data.ua_db_SQL_dialect);
+		stuff_dpb_long(&dpb2, tdgbl->ALICE_data.ua_db_SQL_dialect);
 	}
 
 	if (tdgbl->ALICE_data.ua_user) {
diff --git a/src/alice/tdr.cpp b/src/alice/tdr.cpp
index 6b382e42e8..9f130cd8bb 100644
--- a/src/alice/tdr.cpp
+++ b/src/alice/tdr.cpp
@@ -24,7 +24,7 @@
 //
 //____________________________________________________________
 //
-//	$Id: tdr.cpp,v 1.22 2003-09-18 10:56:32 brodsom Exp $
+//	$Id: tdr.cpp,v 1.23 2003-09-22 08:49:45 brodsom Exp $
 //
 // 2002.02.15 Sean Leyne - Code Cleanup, removed obsolete "Apollo" port
 //
@@ -56,7 +56,7 @@ static void reattach_databases(TDR);
 static bool reconnect(FRBRD *, SLONG, TEXT *, ULONG);
 
 
-const char* NEWLINE="\n";
+const char* NEWLINE = "\n";
 
 static UCHAR limbo_info[] = { gds_info_limbo, gds_info_end };