Bugs fixed

Bugs fixed