Further work on the Safari patch