Fix and changes