Commit more changes, mainly related to logging.