Unicode fixes, closes #178