Fixes for gcal plugin