Fixed some bugs related to the fdn object