Minor updates to facilitate better logging.