Fixed a couple of bugs related to add/rem feedback