diff --git a/source/glest_game/main/program.cpp b/source/glest_game/main/program.cpp
index ae316037b..9c138dc03 100644
--- a/source/glest_game/main/program.cpp
+++ b/source/glest_game/main/program.cpp
@@ -214,7 +214,7 @@ namespace Glest {
 
 		void
 			Program::ShowMessageProgramState::mouseMove(int x, int y,
-				const MouseState &
+				const MouseState *
 				mouseState) {
 			mouseX = x;
 			mouseY = y;
diff --git a/source/glest_game/main/program.h b/source/glest_game/main/program.h
index 409a72974..930648522 100644
--- a/source/glest_game/main/program.h
+++ b/source/glest_game/main/program.h
@@ -263,7 +263,7 @@ namespace Glest {
 				virtual void
 					mouseDownLeft(int x, int y);
 				virtual void
-					mouseMove(int x, int y, const MouseState & mouseState);
+					mouseMove(int x, int y, const MouseState * mouseState);
 				virtual void
 					keyPress(SDL_KeyboardEvent c);
 				virtual void
diff --git a/source/glest_game/type_instances/unit.cpp b/source/glest_game/type_instances/unit.cpp
index 1b071f950..07cc24d79 100644
--- a/source/glest_game/type_instances/unit.cpp
+++ b/source/glest_game/type_instances/unit.cpp
@@ -2726,7 +2726,7 @@ namespace Glest {
 			// or when the unit is selected and right clicked to a position.
 			if (commandType == NULL) {
 				CommandClass command = ccMove; //default command
-				if (this->getType()->isOfClass(ucWarrior) && (targetUnit == nullptr || this->getTeam() != targetUnit->getTeam()))
+				if (this->getType()->isOfClass(ucWarrior) && (targetUnit == NULL || this->getTeam() != targetUnit->getTeam()))
 					command = ccAttack;
 				commandType = type->getFirstCtOfClass(command);