Execution fixes

Some minor fixes.