Minor fixes for puppet 3.7