Fixes for puppet 3