Fixed up template dependencies