fixes for puppet 3