Fix some bugs in out-of-band work