Changed handling of string functions