diff --git a/src/Core/Entities/PlayerEntityContracts.m b/src/Core/Entities/PlayerEntityContracts.m
index 8e7e11d7..6e88e914 100644
--- a/src/Core/Entities/PlayerEntityContracts.m
+++ b/src/Core/Entities/PlayerEntityContracts.m
@@ -57,7 +57,7 @@ static NSString * const kOOLogNoteShowShipyardModel = @"script.debug.note.showSh
 
 - (NSString *) processEscapePods // removes pods from cargo bay and treats categories of characters carried
 {
-	if ([UNIVERSE strict])  return [NSString string];	// return a blank string
+	if ([UNIVERSE strict])  return @"";
 	
 	unsigned		i;
 	BOOL added_entry = NO; // to prevent empty lines for slaves and the rare empty report.
diff --git a/src/Core/Entities/ShipEntity.m b/src/Core/Entities/ShipEntity.m
index 835e8cd4..a628ae74 100644
--- a/src/Core/Entities/ShipEntity.m
+++ b/src/Core/Entities/ShipEntity.m
@@ -227,6 +227,7 @@ static GLfloat calcFuelChargeRate (GLfloat my_mass, GLfloat base_mass)
 	suppressAegisMessages = NO;
 	isMissile = NO;
 	suppressExplosion = NO;
+	_lightsActive = YES;
 	
 	// set things from dictionary from here out - default values might require adjustment -- Kaks 20091130
 	maxFlightSpeed = [shipDict oo_floatForKey:@"max_flight_speed" defaultValue:160.0f];
diff --git a/src/Core/Scripting/OOJSSystemInfo.m b/src/Core/Scripting/OOJSSystemInfo.m
index 0b0a3478..ee22910e 100644
--- a/src/Core/Scripting/OOJSSystemInfo.m
+++ b/src/Core/Scripting/OOJSSystemInfo.m
@@ -465,7 +465,7 @@ static JSBool SystemInfoRouteToSystem(JSContext *context, JSObject *this, uintN
 		return NO;
 	}
 	
-	if (argc == 2)
+	if (argc >= 2)
 	{
 		routeType = StringToRouteType(JSValToNSString(context, argv[1]));
 	}