Fixed some broken contracts