Clean up
Fix port/connection drag regression.