Bugs fixed

Bugs