Build cleanups
Tweak management scripts based on trial run in stage.