Minor fixes to Cargo build.