Encoding related fixes