Fixed All Drive bugs