Fix management commands