More intellij fixing