diff --git a/cwAudioDeviceAlsa.cpp b/cwAudioDeviceAlsa.cpp
index 612b908..804db8c 100644
--- a/cwAudioDeviceAlsa.cpp
+++ b/cwAudioDeviceAlsa.cpp
@@ -166,9 +166,7 @@ namespace cw
             case SND_PCM_STATE_PAUSED:       return "paused";
             case SND_PCM_STATE_SUSPENDED:    return "suspended";
             case SND_PCM_STATE_DISCONNECTED: return "disconnected";
-#if defined(OS_64)  // SND_PCM_STATE_PRIVATE1 is not defined on Rasp. Pi. which also happens to be 32bit OS.                                   
             case SND_PCM_STATE_PRIVATE1:     return "private1";
-#endif              
 
           }
           return "<invalid>";
@@ -493,10 +491,8 @@ namespace cw
             case SND_PCM_STATE_DRAINING:
             case SND_PCM_STATE_PAUSED:
             case SND_PCM_STATE_DISCONNECTED:
-#if defined(OS_64)  // SND_PCM_STATE_PRIVATE1 is not defined on Rasp. Pi. which also happens to be 32bit OS.                      
-              case SND_PCM_STATE_PRIVATE1:
-#endif              
-              //case SND_PCM_STATE_LAST:
+            case SND_PCM_STATE_PRIVATE1:
+            //case SND_PCM_STATE_LAST:
               break;
           }
 
@@ -876,9 +872,7 @@ namespace cw
                     case SND_PCM_STATE_DRAINING:
                     case SND_PCM_STATE_PAUSED:
                     case SND_PCM_STATE_DISCONNECTED:
-#if defined(OS_64) // SND_PCM_STATE_PRIVATE1 is not defined on Rasp. Pi. which also happens to be 32bit OS.                      
-                      case SND_PCM_STATE_PRIVATE1:
-#endif                      
+                    case SND_PCM_STATE_PRIVATE1:
                       continue;
 
                     case SND_PCM_STATE_RUNNING:
diff --git a/cwObject.cpp b/cwObject.cpp
index 1150dd2..454c95b 100644
--- a/cwObject.cpp
+++ b/cwObject.cpp
@@ -144,8 +144,8 @@ namespace cw
   void _objTypePrintUInt16( const object_t* o, print_ctx_t& c ) { printf("%i",o->u.u16); }
   void _objTypePrintInt32(  const object_t* o, print_ctx_t& c ) { printf("%i",o->u.i32); }
   void _objTypePrintUInt32( const object_t* o, print_ctx_t& c ) { printf("%i",o->u.u32); }
-  void _objTypePrintInt64(  const object_t* o, print_ctx_t& c ) { printf("%li",o->u.i64); }
-  void _objTypePrintUInt64( const object_t* o, print_ctx_t& c ) { printf("%li",o->u.u64); }
+  void _objTypePrintInt64(  const object_t* o, print_ctx_t& c ) { printf("%" PRIx64 ,o->u.i64); }
+  void _objTypePrintUInt64( const object_t* o, print_ctx_t& c ) { printf("%" PRIx64 ,o->u.u64); }
   void _objTypePrintBool(   const object_t* o, print_ctx_t& c ) { printf("%s",o->u.b ? "true" : "false"); }
   void _objTypePrintFloat(  const object_t* o, print_ctx_t& c ) { printf("%f",o->u.f); }
   void _objTypePrintDouble( const object_t* o, print_ctx_t& c ) { printf("%f",o->u.d); }