Fixed safari bugs