Some old changes were not committed properly