Further build file updates for alignment with 4.0 build