Fixed part of safari issues