Fix more version 5 parallel running bugs