Fixed status checks