Nations: Minor fixes

Fixed several minor bugs