Nations: Bug fixes

Fixed several minor bugs