Fixing BMReport (not everything)