Safari fixes: Fix #180