More fixes for safari