Fix Command and Persistence modules.

@falkreon X)