Post-merge fixes

src/active.h

src/engine.c

src/parallel_io.c

src/runner.c

src/serial_io.c