Fixing more Safari issues...