Command fixes, Some drive stuph