Minor code changes.