Fixes for ephemeral drive setup.