Bugs corrections.