Fixes for reporting current reporting state