Fix puppettools harder