Fixes for Maruku