Some bugs corrections.