adding the fixes to the template