Fix drives clone functions