Fixed some warnings from the simulator and controllers