2nd round of staging tweaks