Resolve update_type problems.