Fix management commands more