Cleaning up bugs in new live execute.