More bugfixes
Decoding unicode to utf-8 isn't necessary here, and breaks