Fixed small interface issues and regenerated the fixtures
Fixed the dumping tool