BUILD: Updates to improve the maven builds