Fixed Safari bugs