diff --git a/Sources/Engine/Network/SessionState.h b/Sources/Engine/Network/SessionState.h
index 717feaf..db23a96 100644
--- a/Sources/Engine/Network/SessionState.h
+++ b/Sources/Engine/Network/SessionState.h
@@ -60,7 +60,7 @@ public:
   TIME pe_tmTick;
   ULONG pe_ulEntityID;
   ULONG pe_ulTypeID;
-  ULONG pe_ulEventID; // FIXME: make this void* or uintptr_t/size_t
+  ULONG pe_ulEventID;
 
   CPredictedEvent(void);
   void Clear(void) {};
diff --git a/Sources/Engine/Sound/SoundObject.cpp b/Sources/Engine/Sound/SoundObject.cpp
index 9f20aca..8011ae5 100644
--- a/Sources/Engine/Sound/SoundObject.cpp
+++ b/Sources/Engine/Sound/SoundObject.cpp
@@ -213,8 +213,7 @@ void CSoundObject::Play(CSoundData *pCsdLink, SLONG slFlags)
 
   //CPrintF("PLAY: '%s'", (const char*)pCsdLink->GetName().FileName());
   // get prediction tail
-  STUBBED("64-bit issue");
-  CSoundObject *psoTail = GetPredictionTail(EVENT_SOUNDPLAY, (ULONG)(size_t)pCsdLink);
+  CSoundObject *psoTail = GetPredictionTail(EVENT_SOUNDPLAY, PointerToID(pCsdLink));
   // if the event is predicted
   if (psoTail==NULL) {
     // do nothing;
@@ -350,8 +349,7 @@ void CSoundObject::Stop(void)
 
   CSoundObject *psoTail = this;
   // get prediction tail
-  STUBBED("64-bit issue");
-  psoTail = GetPredictionTail(EVENT_SOUNDSTOP, (ULONG)(size_t)so_pCsdLink);
+  psoTail = GetPredictionTail(EVENT_SOUNDSTOP, PointerToID(so_pCsdLink));
   // if the event is predicted
   if (psoTail==NULL) {
     // do nothing;