Fixed Some issue

Merger from Sushil For some fixes