Making template vars consistent