Encoding Fixes