Fix some deadlock issues on slower machines
Snapshot (13w23b) Update (Chat broken currently)