Fixes for latest cartridges and environment variables