[ros-diffs] [blight] 13843: Fix build with optimizations and one or two bugs - should have tested with optimizations before committing :-/