Fix mistakes on previous pull requests

A few mistakes I slipped in my last PRs, sorry.