Minor update improvements