Minor reporting optimizations