Reporter fixes