Changes from Mozilla's