ZUMO: found and fixed a bunch of other code for the portable client library changes