More static building fixes