fix some errors regarding newIncoming, newBuddy