Add fixes for issues reported by tests.sh
7 files changed