Bugs related to the revision changes