More fixes for Citizens