More changes for ruboto 0.10.0