Modify some feedback bugs