Improve cargo build script