Move more calls to the correct thread