Fix more bugs in out-of-band work