Bug fixes for drag enable
merged manually