More encoding fixes for error messages