Fixing more dangling template refs