More fixes for separate ycmd