Fixed more encoding problems