Report and datasource corrections