Reporter fixes

Depends on #327.