Some improvements on build script again