Fixes to new analytics reporting