More safari improvements