Fixed things Intellij didn't like