Fixes for Safari 6