Fixed status issues