Some encoding fixes (I hope)...