Fix up status command