More safari fixes