Partial Fixes to Safari