Moar Mako repo fixes...

Change-Id: If2c8e2432d9ea6e58e9177637b8db211c1bd1f90