Fix last remaining encodings