Fix a couple of potential deadlocks in commit b30b43b4