fixed some setup/run problems from last nightly update