Fix some status mistakes