Small fixes before new updater