Improved work on static linking