bugfixes and fairness changes