Fixed Safari issues