Making the completions a little bit more sensible