Fixes for in-memory splits