Some code changes.