Codec tweaks, changed constructor