Unicode fixes

Fixes #295