cleanup build errors for CA interface changes