Fix linking; Add option to force linking