Fixed warnings in AHI code (Part 2).