Fixing some autocompletion problems.