Fixed some of the contracts.