Bug fixes related to dumping and stability of the tool
Fixes #66