Fixing other templates