Fix a few things that are causing issues on the Mac on a background thread