More OSS/Sonatype tweaks.