WIP: Fix POMs

Change-Id: I791ca43ad5838bd5ace4a9e65c9e918a282484b1