Encoding fixes :)