safari/ff fixes