Fix errors from conversion