Status fixes