Modify a couple of error messages slightly