Fixup maven dependencies