Fixed auto-update and metrics