More code analysis fixes, untrack .iml