Fix refs and dependencies in updater logic