minor fixes in stateful operators