Fix some regressions caused by the execution slot tracker check in.