ZUMO: more minor bug fixes for staged updates
Merge pull request #1265 from ggailey777/zumo_master

ZUMO: more minor bug fixes for staged updates