Fixes on the command/memento class model