Some Cargo tweaks