AIxWall

Results 2 issues of AIxWall

This reverts commit 98d624a.

fix build error