Fix errors in previous commits