Bugfix in destructor etc.

No match.