More fixes for Firefox compatibility.