Zumo: various fixes and cleanup