More fixes, including one specific to FireFox.