diff --git a/src/object/ObjectManager.cpp b/src/object/ObjectManager.cpp
index 3a0a09ac31..da43e32a3c 100644
--- a/src/object/ObjectManager.cpp
+++ b/src/object/ObjectManager.cpp
@@ -62,6 +62,7 @@ public:
         auto requiredObjects = new const ObjectRepositoryItem *[OBJECT_ENTRY_COUNT];
         if (!GetRequiredObjects(entries, requiredObjects, &numRequiredObjects))
         {
+            delete[] requiredObjects;
             return false;
         }
 
@@ -69,7 +70,7 @@ public:
         size_t numNewLoadedObjects;
         Object * * loadedObjects = LoadObjects(requiredObjects, &numNewLoadedObjects);
 
-        delete requiredObjects;
+        delete[] requiredObjects;
 
         if (loadedObjects == nullptr)
         {
diff --git a/src/object/ObjectRepository.h b/src/object/ObjectRepository.h
index 45e0602a13..21620e4209 100644
--- a/src/object/ObjectRepository.h
+++ b/src/object/ObjectRepository.h
@@ -94,3 +94,8 @@ const utf8 *    object_get_description(const void * object);
 void            object_draw_preview(const void * object, rct_drawpixelinfo * dpi);
 
 #endif
+
+enum ORI_RIDE_FLAG
+{
+    ORI_RIDE_FLAG_SEPARATE = 1 << 0,
+};
diff --git a/src/object/RideObject.cpp b/src/object/RideObject.cpp
index 22929f6ae0..58f55fb273 100644
--- a/src/object/RideObject.cpp
+++ b/src/object/RideObject.cpp
@@ -367,7 +367,7 @@ void RideObject::SetRepositoryItem(ObjectRepositoryItem * item) const
     if ((_legacyType.flags & RIDE_ENTRY_FLAG_SEPARATE_RIDE_NAME) &&
         !rideTypeShouldLoseSeparateFlag(&_legacyType))
     {
-        flags |= 0x1000000;
+        flags |= ORI_RIDE_FLAG_SEPARATE;
     }
     item->RideFlags = flags;
 }
diff --git a/src/windows/editor_object_selection.c b/src/windows/editor_object_selection.c
index c462948e25..946cce1152 100644
--- a/src/windows/editor_object_selection.c
+++ b/src/windows/editor_object_selection.c
@@ -1898,14 +1898,14 @@ static rct_string_id get_ride_type_string_id(const ObjectRepositoryItem * item)
 	return result;
 }
 
-bool editor_check_object_group_at_least_one_selected(int objectType)
+bool editor_check_object_group_at_least_one_selected(int checkObjectType)
 {
 	int numObjects = (int)object_repository_get_items_count();
 	const ObjectRepositoryItem * items = object_repository_get_items();
 
 	for (int i = 0; i < numObjects; i++) {
 		uint8 objectType = items[i].ObjectEntry.flags & 0x0F;
-		if (objectType == objectType && (_objectSelectionFlags[i] & OBJECT_SELECTION_FLAG_SELECTED)) {
+		if (checkObjectType == objectType && (_objectSelectionFlags[i] & OBJECT_SELECTION_FLAG_SELECTED)) {
 			return true;
 		}
 	}