More debugging
Tried various things to fix deadlocking... Out of ideas.