Minor changes for Safari