Additional API key related fixes