Fixed POM Issues in Core