Make small housekeeping changes