Changed the updater locking to be much simpler and to use a global. It seems to work.