otw - A few fixes to plan execution.