More fixes for selenium tests