Fix up handling of DriveId vs folder name