Fixed some issues with adding and removing tracked devices.