More minor Mozilla-requested changes