Fixes for Firefox, some cleanups