Fix minor AiaB bugs

Change-Id: I06b6665969e1957ecbb86545205a5cda490e281b
3 files changed