Fix drag problems