Fix some things (I fail at intellij)