Minor improvements in report script