Fix autocomplete/yasnippet problems