fork mode fixes