Fix some flakes.