Fix a few crashes/hangs from general QS use