Minor housekeeping tweaks