Attempting to make things more Unicode-friendly