Fixed up completions