Some characters cleanup