Fixes for cargo-lite