Some additional changes.