Fixes in AD

Change-Id: Ia76f97273b4a88e3a8e854323155f4b47a5d3c70