Further work on Safari patch