Sonatype deployment fixes