Fix some of the codec horro