collate and namespace fixes