fix some problems and allow Uniques to be released