Correct bugs with charset