More AD Fixes