Cartridge fixes

[merge]