Updated files from last template fix