migrate fixes to SO-surg-elect