contract-fixes