diff --git a/src/audio/AudioLogic.cpp b/src/audio/AudioLogic.cpp
index 9080a2dd..cc157389 100644
--- a/src/audio/AudioLogic.cpp
+++ b/src/audio/AudioLogic.cpp
@@ -3849,9 +3849,9 @@ cAudioManager::GetPedCommentSfx(CPed *ped, int32 sound)
 	//if (ped->IsPlayer())
 	//	return GetPlayerTalkSfx(sound);
 
-	// TODO: miami peds
+	// TODO(Miami): ped comments
 
-	return TOTAL_AUDIO_SAMPLES;
+	return NO_SAMPLE;
 }
 
 void
diff --git a/src/audio/sampman_miles.cpp b/src/audio/sampman_miles.cpp
index a2a206a4..ad2c512f 100644
--- a/src/audio/sampman_miles.cpp
+++ b/src/audio/sampman_miles.cpp
@@ -1469,6 +1469,10 @@ cSampleManager::_GetPedCommentSlot(uint32 nComment)
 	for ( int32 i = 0; i < _TODOCONST(3); i++ )
 	{
 		slot = nCurrentPedSlot - i - 1;
+#ifdef FIX_BUGS
+		if (slot < 0)
+			slot += ARRAY_SIZE(nPedSlotSfx);
+#endif
 		if ( nComment == nPedSlotSfx[slot] )
 			return slot;
 	}
diff --git a/src/audio/sampman_oal.cpp b/src/audio/sampman_oal.cpp
index 30efd7f5..f16afbba 100644
--- a/src/audio/sampman_oal.cpp
+++ b/src/audio/sampman_oal.cpp
@@ -800,6 +800,10 @@ cSampleManager::_GetPedCommentSlot(uint32 nComment)
 	for (int32 i = 0; i < _TODOCONST(3); i++)
 	{
 		slot = nCurrentPedSlot - i - 1;
+#ifdef FIX_BUGS
+		if (slot < 0)
+			slot += ARRAY_SIZE(nPedSlotSfx);
+#endif
 		if (nComment == nPedSlotSfx[slot])
 			return slot;
 	}
diff --git a/src/control/Pickups.cpp b/src/control/Pickups.cpp
index 9492e0e1..4e4c02ab 100644
--- a/src/control/Pickups.cpp
+++ b/src/control/Pickups.cpp
@@ -136,6 +136,7 @@ CPickup::GiveUsAPickUpObject(int32 handle)
 	object->bExplosionProof = true;
 	object->bUsesCollision = false;
 	object->bIsPickup = true;
+	object->bHasPreRenderEffects = true;
 
 	object->m_nBonusValue = m_eModelIndex == MI_PICKUP_BONUS ? m_nQuantity : 0;