fork mode small fixes & cleanups