Fixes to execution