Fix Maven again and again