Solve some problems with changes not staged