Minor fixes for deploying to Maven Central