ADD - Fix some bugs