Begin fixing UNICODE issues