Fixes to mojo class
Bugfixes