Bugs corrections