Fixes for missed encodings