Fixing some problems with the Google Drive integration