First pass at upgrade of targets.