unicode-related fixes