master : Fixed templating issues