Fix warning/status field order