Minor changes after auditing diff from earlier version