Google Drive - Fixes