Small changes to work with latest Chromium.