Minor fixes in ESX agent