Fixes for Cargo plugin