Update to last Cargo update
Improve cargo build script