Even more unicode fixes

This should finally fix #119