Fixed some issues with the API keys