More changes to adapt to Firefox browser.