Updates to make staging a bit more robust