Misc issues raised while working on #8603

No issues other than this PR have been opened. The tests document the changes that have been made or else increases coverage.