Minor fixes

I was working on an actual MR (hopefully coming soon) and I made a few tweaks while I was in the code.

I separated them as different commits but am grouping them in this MR for ease.