restored collate and charset constants