more fixes for chromium-stable