More finetunings to build script