Fix issues in the maven build system