A few bug fixes due to updates in puppet, rolling back to puppet 3.3