some triage fixes