Fix Cargo
Small macro fixes