A few more fixes and tweaks for improved staging times