fixes for Strings and Unicode