Bug/Type fixes in And Neg Pos.