diff --git a/LEGO1/lego/legoomni/include/legoanimactor.h b/LEGO1/lego/legoomni/include/legoanimactor.h
index a9b27e9f..289efaed 100644
--- a/LEGO1/lego/legoomni/include/legoanimactor.h
+++ b/LEGO1/lego/legoomni/include/legoanimactor.h
@@ -23,7 +23,7 @@ struct LegoAnimActorStruct {
 class LegoAnimActor : public virtual LegoPathActor {
 public:
 	LegoAnimActor() { m_curAnim = -1; }
-	~LegoAnimActor();
+	~LegoAnimActor() override;
 
 	// FUNCTION: LEGO1 0x1000fba0
 	inline const char* ClassName() const override // vtable+0x0c
diff --git a/LEGO1/lego/legoomni/src/paths/legoanimactor.cpp b/LEGO1/lego/legoomni/src/paths/legoanimactor.cpp
index cf32e1da..763cb48d 100644
--- a/LEGO1/lego/legoomni/src/paths/legoanimactor.cpp
+++ b/LEGO1/lego/legoomni/src/paths/legoanimactor.cpp
@@ -154,9 +154,9 @@ void LegoAnimActor::SetWorldSpeed(MxFloat p_worldSpeed)
 		m_worldSpeed = p_worldSpeed;
 	}
 	MxU32 size;
-	if (m_animMaps.begin() != NULL && (size = m_animMaps.size())) {
+	if (m_animMaps.begin() && (size = m_animMaps.size())) {
 		m_curAnim = 0;
-		if (m_worldSpeed >= m_animMaps[(m_animMaps.begin() != NULL ? size : 0) - 1]->m_unk0x00) {
+		if (m_worldSpeed >= m_animMaps[(m_animMaps.begin() ? size : 0) - 1]->m_unk0x00) {
 			if (!m_animMaps.begin()) {
 				m_curAnim = -1;
 			}
@@ -166,7 +166,7 @@ void LegoAnimActor::SetWorldSpeed(MxFloat p_worldSpeed)
 			return;
 		}
 		else {
-			for (MxU32 i = 0; m_animMaps.begin() != NULL && i < size; i++) {
+			for (MxU32 i = 0; m_animMaps.begin() && i < size; i++) {
 				if (m_worldSpeed <= m_animMaps[i]->m_unk0x00) {
 					m_curAnim = i;
 					break;