Fix entity add / remove.