various bug fixes for safari real devices