Fixes to work with new execution scheme