Fix some compatibility issues with older revisions