Dump fixes