Fixing up templates