Fix more stress bugs (ninja)