Upgrade libsvc
misc stuff