diff --git a/src/ca/acctst.c b/src/ca/acctst.c
index 787447a68..27cc0189e 100644
--- a/src/ca/acctst.c
+++ b/src/ca/acctst.c
@@ -1569,7 +1569,9 @@ static unsigned arrayEventExceptionNotifyComplete = 0;
 void arrayEventExceptionNotify ( struct event_handler_args args )
 {
     if ( args.status == ECA_NORMAL ) {
-        printf ( "arrayEventExceptionNotify: expected exception but didnt receive one against \"%s\" \n", 
+        printf (
+            "arrayEventExceptionNotify: expected "
+            "exception but didnt receive one against \"%s\" \n", 
             ca_name ( args.chid ) );
     }
     else {
diff --git a/src/ca/db_access.h b/src/ca/db_access.h
index 890bc8668..4da8f9f93 100644
--- a/src/ca/db_access.h
+++ b/src/ca/db_access.h
@@ -46,19 +46,20 @@ extern "C" {
  *
  * (so far this is sufficient for all archs we have ported to)
  */
-typedef epicsOldString	dbr_string_t;
-typedef epicsUInt8	dbr_char_t;
-typedef epicsInt16	dbr_short_t;
+typedef epicsOldString dbr_string_t;
+typedef epicsUInt8 dbr_char_t;
+typedef epicsInt16 dbr_short_t;
 typedef epicsUInt16	dbr_ushort_t;
-typedef epicsInt16	dbr_int_t;
-typedef epicsUInt16	dbr_enum_t;
-typedef epicsInt32	dbr_long_t;
-typedef epicsUInt32	dbr_ulong_t;
-typedef epicsFloat32	dbr_float_t;
-typedef epicsFloat64	dbr_double_t;
+typedef epicsInt16 dbr_int_t;
+typedef epicsUInt16 dbr_enum_t;
+typedef epicsInt32 dbr_long_t;
+typedef epicsUInt32 dbr_ulong_t;
+typedef epicsFloat32 dbr_float_t;
+typedef epicsFloat64 dbr_double_t;
 typedef epicsUInt16	dbr_put_ackt_t;
 typedef epicsUInt16	dbr_put_acks_t;
-typedef epicsOldString	dbr_class_name_t;
+typedef epicsOldString dbr_stsack_string_t;
+typedef epicsOldString dbr_class_name_t;
 
 #ifndef db_accessHFORdb_accessC
 /* database field types */
@@ -183,7 +184,7 @@ epicsShareExtern READONLY epicsType DBR_XXXXToEpicsType [LAST_BUFFER_TYPE+1];
 /* VALUES WITH STATUS STRUCTURES */
 
 /* structure for a  string status field */
-struct dbr_sts_string{
+struct dbr_sts_string {
 	dbr_short_t	status;	 		/* status of value */
 	dbr_short_t	severity;		/* severity of alarm */
 	dbr_string_t	value;			/* current value */
diff --git a/src/libCom/osi/os/WIN32/osdThread.c b/src/libCom/osi/os/WIN32/osdThread.c
index 6f32638e2..03ca215c6 100644
--- a/src/libCom/osi/os/WIN32/osdThread.c
+++ b/src/libCom/osi/os/WIN32/osdThread.c
@@ -332,7 +332,7 @@ void epicsThreadCleanupWIN32 ()
 }
 
 /*
- * this voodo copied directly from example in visual c++ 7 documentation
+ * this was copied directly from example in visual c++ 7 documentation
  *
  * Usage: SetThreadName (-1, "MainThread");
  */