Few bugs corrections