Small code changes.