More validation fixes
Add some more merge AppData files