FInal (?) tranche 1 changes for compiling.