More nations fixes