some cross os fixes for tester