Fix for firefox;Housekeeping