[aii] some fixes
[aii] fixes