Fix builds to work with origin codec