Some changes in poms and stuff