Fix Safari flexbox issuses

:shipit: