Encoding fixes
Formatting fixes