[fix] Cross browser fixes, it now passes on FireFox and Chrome