Fixing up client templates