Fix execution bugs