Some minor improvements to get roscore running