Updated compatibility with several browsers