Some fixing of string-related issues