Fixing weird templates