Further fixes for id-ing ourselves to Gmail