As well as a few other minor enhancements
[skip ci]