Various fixes related to reporting