Fix and updates