More codec2 build errors fixed.