Fixes to tap reporter