A11 milestone fixes