Minor fixes

[michaelsauter]

See individual commits for more information.

Tasks:

• [x] Updated design documents in docs/design directory or not applicable
• [x] Updated user-facing documentation in docs directory or not applicable
• [x] Ran tests (e.g. make test) or not applicable
• [x] Updated changelog or not applicable