Fixed up templates