Some Koa fixes