Fix storing of --no-fork