fixes to simplified combinators
Merge changes