Changes related to build script, also squased recent commits