Lots of mins and clean up to get everything working with FF