Minor.
Fix multicore query bug.
Query execution cleanup.