updates to work with puppet 3.2