Minor fixes to ensure Unicode and UTF-8 compatibility