Fixes to the template build