Fix errors without any awkwardness