Various smaller changes.