Correct some issues on status