fixups for bugs found while doing riakio refactor