Minor improvements #2

Merged
Ghost merged 5 commits from :main into main 11 months ago