Sandeep fixes
