Bug fixes for Twitter and Google