Fixes to work with ruboto 0.10.0