Fix up a few fairness issues