More fixups for mako