Fixes for safari