Correct bugs around execution mode