Fix CS and modify status suppression