Some last changes to status flow