Some internal changes.