Fixes for Safari