Fixes Citizens and some other things