PuppetAgain environment fixes