Conform to latest libcappy