Threaded viewer fixes