Fixes for emulated storage