Fix errors in #14