Few bugs fixed