FIX intellij inspection issues