Some wrong changes fixed