Make Node construction a little safer
Deadlock breaking seems to be working reliably