Fixed a couple of subtle bugs that was preventing mutlidrop from working correctly