Template fixes so it compatible with puppet 3.3