Fix a few charmap bugs maybe?