Yet more static build fixes.