More fixes for persistence tool. Hopefully you can run it on NCD data
now.