Lots of minor fixes to many contracts.