Some fixes for old safari