Fix errors from my past