FD handling changes