Fix errors in split setup