More static library stuff