more safari fixes