Minor bug fixes for reporting