Fix issues with execution