Clean up
Firefox fix