GH #201 - API keys fixes.