fix upgrade issues; edit scalar lists