More static linking fixes...