Some small changes to work with the Metis templates now in the Moqui master branch