Fixing up the api key situation