Fix providing/consuming contracts