Drag bug fixes... Again.