Fixed a couple of mozilla issues