More special character fixes.