Miscellaneous fixed in string handling