Added some drag/drop related bug fixes.