Further performance enhancements
Firefox fixes