Minor errs found by upgrade test
Proper ice34 upgrade test
Minor typos