Intellij warnings fixed