fixes for out-of-process mode