Fix up Operation Contracts