Various cleanup related to strings