Fix Maven support