A bunch of minor cosmetic enhancements