Fixed more encodings.