Fix some problems with Google Drive