More improvements. Patch a broken piece of Puppet so the install properly completes.