Improve static build