#7057: fix several errors.
6 files changed