Addressed some IAA issues