Fix few more intermittent testsuite issues