ZUMO: more minor bug fixes for staged updates