Further work to make deployment to Maven central work