Wool fix

Confusing incompatibility with the one team wool limit thing is fixed in
a strange, roundabout way that probably could be done better.
Merge origin/development