Contracts 1.5 and other various fixes