A few character fixes