More changes for static build