More v0.3 triage