diff --git a/src/JSystem/JUtility/JUTConsole.cpp b/src/JSystem/JUtility/JUTConsole.cpp
index e4e5d235d..c599b3a47 100644
--- a/src/JSystem/JUtility/JUTConsole.cpp
+++ b/src/JSystem/JUtility/JUTConsole.cpp
@@ -250,7 +250,7 @@ void JUTConsole::print(const char* param_0) {
 
 /* 802CAFB0-802CB03C       .text JUTConsole_print_f_va_ */
 void JUTConsole_print_f_va_(JUTConsole* console, const char* fmt, va_list args) {
-    JUT_ASSERT(561, console!=0);
+    JUT_ASSERT(561, console!=NULL);
     char buf[1024];
     vsnprintf(buf, sizeof(buf), fmt, args);
     console->print(buf);
diff --git a/src/d/actor/d_a_leaflift.cpp b/src/d/actor/d_a_leaflift.cpp
index 12504c440..bb9d879be 100644
--- a/src/d/actor/d_a_leaflift.cpp
+++ b/src/d/actor/d_a_leaflift.cpp
@@ -76,7 +76,7 @@ static void rideCallBack(dBgW* param1, fopAc_ac_c* i_this, fopAc_ac_c* i_other);
 /* 000001E0-00000338       .text CreateHeap__9daLlift_cFv */
 BOOL daLlift_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData *)dComIfG_getObjectRes(m_arcname, OLIFT_BDL_OLIFT);
-    JUT_ASSERT(0x14e, modelData != 0);
+    JUT_ASSERT(0x14e, modelData != NULL);
 
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
     if (!mpModel) {
@@ -201,7 +201,7 @@ static void rideCallBack(dBgW* param1, fopAc_ac_c* i_act, fopAc_ac_c* i_other) {
             posOffset = posOffset.outprod(up_vec);
             mDoMtx_stack_c::YrotS(-i_this->current.angle.y);
             mDoMtx_stack_c::multVec(&posOffset, &posOffset);
-            s16 angle = (i_this->mActorLifetimeFrameCount & 0x1F) << 11;
+            s16 angle = (i_this->mActorLifetimeFrameCount % 32U) * (0x10000 / 32);
             tiltFactor = cM_ssin(angle) * 2.0f * 0.25f * (cM_rndFX(0.2f) + 1.0f);
         }
         offsetMagnitude = posOffset.abs();
diff --git a/src/d/actor/d_a_shutter2.cpp b/src/d/actor/d_a_shutter2.cpp
index d25ec3c8d..eff3c5af6 100644
--- a/src/d/actor/d_a_shutter2.cpp
+++ b/src/d/actor/d_a_shutter2.cpp
@@ -33,7 +33,7 @@ BOOL daShutter2_c::Delete() {
 /* 000000B8-00000194       .text CreateHeap__12daShutter2_cFv */
 int daShutter2_c::CreateHeap() {
     J3DModelData* modelData = (J3DModelData *)dComIfG_getObjectRes(m_arcname[mType], m_bdlidx[mType]);
-    JUT_ASSERT(0xe0, modelData != 0);
+    JUT_ASSERT(0xe0, modelData != NULL);
     mpModel = mDoExt_J3DModel__create(modelData, 0x80000, 0x11000022);
     if (!mpModel) {
         return FALSE;