Fixed Safari problems