API key fixes