Fixed some Safari issues