Puppet provisioning fixes

Some updates to get puppet provisioning working.