More fixes for updating from older revisions