Improve maven build (still breaking travis)