More browser compatibility changes