more freaking unicode fixes, god I hate unicode