Fix for new threaded reactor

Fixes for issues reported by @terminalmage @whiteinge in #18762

Still need to write tests for the reactor, but hopefully this will close out the remaining issues for now