Lots of silly CommitChanges fixes