[Akash/Sartaj/mehak] fixes