Fix errors from CB-6337 CB-6338

I can't actually find our CI to confirm that it likes everything, but `npm test` only shows the errors that aren't mine.