Small fixes

Hi Elliot,

I originally wanted to do separate pull requests for the issues, but I messed up - so I'm deleting my other pull request and collecting my small fixes in this one.

I hope you approve!

Best
- Jérôme