Fixes in AD

Change-Id: I9aa4203ff40104f3dad6122d8aad53b1f4e148bc