Collection related unicode errors fix