Fixed the bugs with yserver after merging the upstream caused by use of common libraries