Fixups, actually only support 'ok' and 'Bail out'
Merge branch 'tap'