fixes to make CAPI changes compile