Fixes for districts after latest changes