Intellij code analysis fixes