Bug fixing: adapting to unicode string management trhoughout code