fix some flakiness