6805: add missing items to save state