Minor fixes for safari