More fixes.
Merge branch 'master' of http://github.com/roadnarrows-robotics/hekateros