Add Minor Fixes and Updates

Add a number of minor fixes to cover manual changes and recent updates.

Checklist

Please confirm the following checks:

[x] My pull request follows the guidelines set out in CONTRIBUTING.md.
[x] I have performed a self-review of my code and run any tests locally to check.
[ ] I have added tests that prove my changes are effective and work correctly.
[ ] I have made corresponding changes to the documentation as needed.
[x] I have checked my code and corrected any misspellings.
[x] Each commit in this pull request has meaningful subject & body for context.
[x] I have squashed all "fix(up)" commits to provide a clean code history.
[x] My pull request has an appropriate title and description for context.
[ ] I have linked this pull request to other issues or pull requests as needed.
[x] I have added type/..., changes/..., and 'release/...' labels as needed.