Fixed some minor bugs WRT reporting