More static link fixes