Fix organization counters