[Anil/Mihir] fixing small issues