NSCharacterSet fixes