Reactor fixes