Fixes for static build.