Minor updater fixes
Update fixes post-testing