Minor fixes

Little fixes I missed during all the different PRs I was working on