Fixing up graphs and templates