DB dump fixes