Export changes and validation fixes