Fixes to work with current version of Chromium.