More POM changes