Fix errors for #4