Improve one error message and fix typo in another