Fixes in preparation for release to Sonatype release