Fix DragObjects and DrawRectangle as well