Bunch of changes related to saving FD set.