Starting fixes
Starting to fix safari