Fix issues with POM files