minor changes for Safari support