Fixup various previous broken commit.
Merge pull request #24 from sunyc/i9-warnings

Fixup various previous broken commit.