Updates to fix mvn-install issue