Fix a couple minor issues in multithreading

Fixes reset sometimes not working properly (hopefully it's finally dead this time), and fixes #6508.

-[Unknown]