Some fixes in adSvc