Fixing up execution