Fixed build, ready for maven-central.