fixing two drag&drop bugs