Dumptank fixes