Fix some address-handling deadlocks