Updates for static linking