Fix to some error messages