fix some codec issues