Fix Maven issues