Fix repeat bug with firefox and other minors