Maven fixes

Some of your changes appear on here, but thats due to me just updating what I had before my last pr.