Fix contracts in safe