Updates to fix browser compatiblity