Fixes for issues 273 and 274 in coto/gae-boilerplate.