More adjustments to inmem