Separate process handling fixes