Neeraj changes

Fixing failures in some cases