Fixed compilation issues that IntelliJ didn't catch automatically.  Never commit code in a rush on the train.