c&d: small fixes