Small fixes and temporary libtorrent fix