Some patches to CVC3 compatibility layer; Thanks to Adam Buchbinder @ Google for the report and patch!