Some corrections for static lib target.