A few minor fixes

Hopefully, you'll find these useful.