Fixing templates...