minor tweaks to deal with flakiness in various features