Easy bug fixes

These are minor bug fixes that supersede part of https://github.com/agl/pond/pull/136