Fix Template Registrations