Many tweaks to keep in tune with newest puppet. Deprecations etc