Correct some bugs in the incoming