Puppet fixes