StorageDevice fixes