Fix envpuppet