Tweaks for static linking