diff --git a/rover/src/.idea/src.iml b/rover/src/.idea/src.iml
index 347a787f..7dde2b0a 100644
--- a/rover/src/.idea/src.iml
+++ b/rover/src/.idea/src.iml
@@ -459,7 +459,7 @@
           <root url="file:///usr/lib/gcc/x86_64-linux-gnu/5/include" />
           <root url="file:///usr/include" />
           <root url="file:///usr/local/include" />
-          <root url="file:///opt/ros/kinetic/include" />
+          <root url="file:///opt/ros/melodic/include" />
           <root url="file://$USER_HOME$/.CLion2016.2/system/cmake/generated/src-bcfbf7f8/bcfbf7f8/Debug0/devel/include" />
           <root url="file://$USER_HOME$/.CLion2016.2/system/cmake/generated/src-bcfbf7f8/bcfbf7f8/Release0/devel/include" />
           <root url="file://$USER_HOME$/.CLion2016.2/system/cmake/generated/src-bcfbf7f8/bcfbf7f8/RelWithDebInfo0/devel/include" />
@@ -472,7 +472,7 @@
           <root url="file:///usr/lib/gcc/x86_64-linux-gnu/5/include" />
           <root url="file:///usr/include" />
           <root url="file:///usr/local/include" />
-          <root url="file:///opt/ros/kinetic/include" />
+          <root url="file:///opt/ros/melodic/include" />
           <root url="file://$USER_HOME$/.CLion2016.2/system/cmake/generated/src-bcfbf7f8/bcfbf7f8/Debug0/devel/include" />
           <root url="file://$USER_HOME$/.CLion2016.2/system/cmake/generated/src-bcfbf7f8/bcfbf7f8/Release0/devel/include" />
           <root url="file://$USER_HOME$/.CLion2016.2/system/cmake/generated/src-bcfbf7f8/bcfbf7f8/RelWithDebInfo0/devel/include" />
diff --git a/rover/src/CMakeLists.txt b/rover/src/CMakeLists.txt
index 581e61db..66dd650a 120000
--- a/rover/src/CMakeLists.txt
+++ b/rover/src/CMakeLists.txt
@@ -1 +1 @@
-/opt/ros/kinetic/share/catkin/cmake/toplevel.cmake
\ No newline at end of file
+/opt/ros/melodic/share/catkin/cmake/toplevel.cmake
\ No newline at end of file
diff --git a/rover/src/owr_drive_controls/src/JointSpeedBasedPositionController.cpp b/rover/src/owr_drive_controls/src/JointSpeedBasedPositionController.cpp
index 96777341..a42d6f63 100644
--- a/rover/src/owr_drive_controls/src/JointSpeedBasedPositionController.cpp
+++ b/rover/src/owr_drive_controls/src/JointSpeedBasedPositionController.cpp
@@ -79,7 +79,7 @@ JointSpeedBasedPositionController::JointSpeedBasedPositionController(double radi
 int JointSpeedBasedPositionController::posToPWM(double futurePos, double currentPos, double updateFrequency) {
     
     //check for infinity - we should stop
-    if(std::isinf<double>(currentPos)) {
+    if(std::isinf(currentPos)) {
         ROS_ERROR("Current Position is infinity!");
         return deltaPWM/2 + minPWM;
     }