fix execution unit bugs