Various completer changes