Puppet and build fixes