Little fixes

`mvn clean package verify` runs successfully for me.