Fixed some status handling