Fairshare fixes