Fixed introduced errors in Windows/Non-ROS

Some changes for ROS compatibility had to be adjusted.