moar execution fixes