some changes to support opera