Minor changes and revert more previous changes related to unique_string