re-add libmercury, fix qmuxd