WIP: Crossbrowser fixes