Fixes for kiji-express-tools.