Fix and rebuild