Special Character fixes