Fixed some warnings and removed 'SaveToDrive'