encoding fixes
encoding fixes