Shutdown fixes and changed updater