fixes for Mojito