More fixes
updates after youcompleteme stuff