Fixin up templates