First batch of fixes for Cargo