Improve browser support + cosmetic fix