Fix 'fork' option handling