Export page fixes. See commits