Some fixes, having 2nd and 3rd thoughts on codecs