Add utf-8 stuff for 1.9.3