Various fixes. mvn clean verify now passes.