Bugs resolved

Bugs resolved