more mako fixes