8.54: fixed a couple CAP implementation issues.