cro: small fixes.