Update to keep 1.8.7 compatibility
Fix typo
Merge branch 'council-changes'