static fixes and links