fixup! Fix management commands