Maven issues fix part two