More encoding fixes

Heres hoping all fixed now