Fixed api key problems