More watch-puppy build env fixes