codec2 small fixes

Code cleanups.