Applying several fixes after running tests on oldIE