Execution fixes

Some minor fixes.
Done.