Fixes for Mac Safari