Fix bugs in changes related to using the Google Calendar API.