youcompleteme and minor fixes