Minor tweaks to the CAPI support