Fix and changes.