Stability fixes for Codec CLI