more mojo->master return path fixes