Progress on Safari fix.