Fixing up contracts