Fixes for Mako