first set of post 1.6 fixes to build system