Aadd v713 fixes