Report fixes

Report fixes from sushil to sprint 5