Fixes for storage other than emulated