Added unicode conversions back (they were necessary after all).