Extra library links and tweaks