Small fixes in completer.