couple of fixes suggested by IntelliJ