Fixes to make sure that we're not trying to compile the MMAP_STORAGE option in the EE unless we really want. This will fix the valgrind errors