Minor changes in build properties inclusion order