Fix some fixes to the changes system