This partially fixes the showstopper bug with crashes and deadlocks, but
there's still another issue that seems to be related to project loading.