Final nations fixes hopefully