Apikey handling tweaks