Commit before fixing
First round of finalization