more ycm related fixes