Fixes for multiple drives