Fixing more bugs with the template build
Templates build now