Small fixes to allow the project to be published on Sonatype