Compile fixes for ROS Indigo (on Ubuntu 14.04)