Fixed some more error messages