Further fix completions