Fix "potential" deadlock and make not-a-deadlock