WIP - safari fixes