Fixes to work with latest Google Chrome