More fixes in Safari (I guess)