added Firefox fix and PI fix