fixes for cpp, neocomplete