Improve firefox compatibility